From 900fa535bcc40d77a44d66d6845a68dde0f91aca Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 1 Mar 2020 15:20:49 +0000 Subject: [PATCH] run-with-locales: Spell UTF-8 locales in the way the script understands Gbp-Dch: ignore --- debian/rules | 6 +++--- debian/tests/installed-tests | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index 52b2afd5df..3066dea9bb 100755 --- a/debian/rules +++ b/debian/rules @@ -184,9 +184,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) env -u LD_PRELOAD \ xvfb-run -a -s "-screen 0 1024x768x24" \ debian/run-with-locales \ - --generate de_DE.UTF-8 \ - --generate en_GB.UTF-8 \ - --generate en_US.UTF-8 \ + --generate de_DE.utf8 \ + --generate en_GB.utf8 \ + --generate en_US.utf8 \ --generate sv_SE \ -- \ dh_auto_test --builddirectory=debian/build/deb -- -k 0 -j 1 || true diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests index 83b57ea25e..426a33130a 100755 --- a/debian/tests/installed-tests +++ b/debian/tests/installed-tests @@ -14,9 +14,9 @@ export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP" exec dbus-run-session -- \ xvfb-run -a -s "-screen 0 1024x768x24" \ debian/run-with-locales \ - --generate de_DE.UTF-8 \ - --generate en_GB.UTF-8 \ - --generate en_US.UTF-8 \ + --generate de_DE.utf8 \ + --generate en_GB.utf8 \ + --generate en_US.utf8 \ --generate sv_SE \ -- \ gnome-desktop-testing-runner \ -- 2.30.2